Autogenerated HTML docs for v1.7.2.3-313-gcd15
diff --git a/git-config.html b/git-config.html index e239e27..578494b 100644 --- a/git-config.html +++ b/git-config.html
@@ -2965,10 +2965,11 @@ </dt> <dd> <p> - Set default date-time mode for the log command. Setting log.date - value is similar to using <em>git log</em>'s --date option. The value is one of the - following alternatives: {relative,local,default,iso,rfc,short}. - See <a href="git-log.html">git-log(1)</a>. + Set the default date-time mode for the <em>log</em> command. + Setting a value for log.date is similar to using <em>git log</em>'s + <tt>--date</tt> option. Possible values are <tt>relative</tt>, <tt>local</tt>, + <tt>default</tt>, <tt>iso</tt>, <tt>rfc</tt>, and <tt>short</tt>; see <a href="git-log.html">git-log(1)</a> + for details. </p> </dd> <dt> @@ -3068,6 +3069,21 @@ </p> </dd> <dt> +merge.renormalize +</dt> +<dd> +<p> + Tell git that canonical representation of files in the + repository has changed over time (e.g. earlier commits record + text files with CRLF line endings, but recent ones use LF line + endings). In such a repository, git can convert the data + recorded in commits to a canonical form before performing a + merge to reduce unnecessary conflicts. For more information, + see section "Merging branches with differing checkin/checkout + attributes" in <a href="gitattributes.html">gitattributes(5)</a>. +</p> +</dd> +<dt> merge.stat </dt> <dd> @@ -4054,7 +4070,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2010-09-01 18:42:44 UTC +Last updated 2010-09-03 21:30:10 UTC </div> </div> </body> 